Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Fix sticky notifications not working #18285

Merged
merged 1 commit into from
Jul 17, 2020
Merged

[FIX] Fix sticky notifications not working #18285

merged 1 commit into from
Jul 17, 2020

Conversation

ggazzo
Copy link
Member

@ggazzo ggazzo commented Jul 17, 2020

Proposed changes

Issue(s)

How to test or reproduce

Screenshots

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves a current function)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Hotfix (a major bugfix that has to be merged asap)
  • Documentation Update (if none of the other choices apply)

Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if applicable)
  • I have added necessary documentation (if applicable)
  • Any dependent changes have been merged and published in downstream modules

Changelog

Further comments

@ggazzo ggazzo added this to the 3.5.0 milestone Jul 17, 2020
pierre-lehnen-rc
pierre-lehnen-rc approved these changes Jul 17, 2020
View reviewed changes
Copy link
Contributor

@pierre-lehnen-rc pierre-lehnen-rc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I coudn't test the behavior as the requireInteraction flag doesn't work on linux, but this change fixes the setTimeout problem.

app/ui/client/lib/notification.js
const n = new Notification(notification.title, {
icon: notification.icon || getUserAvatarURL(notification.payload.sender.username),
body: s.stripTags(message.msg),
tag: notification.payload._id,
silent: true,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change seems unrelated to the rest of the PR.

@ggazzo ggazzo merged commit 02d69d0 into develop Jul 17, 2020
@ggazzo ggazzo deleted the fix/sticky-notifications branch July 17, 2020 19:14
gabriellsh added a commit that referenced this pull request Jul 17, 2020
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into rewr…
55a684f 
…ite/webdav

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [FIX] Fix sticky notifications not working  (#18285)
  Regression: Account Sidebar not rendering properly (#18288)
  Regression - Profile page crashing for users without password  (#18287)
@sampaiodiego sampaiodiego mentioned this pull request Jul 28, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pierre-lehnen-rc pierre-lehnen-rc pierre-lehnen-rc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.5.0
Development

Successfully merging this pull request may close these issues.
2 participants
@ggazzo @pierre-lehnen-rc